From 8574ea561905e60bd6d86cbc645a4689a940d1bd Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 10 Sep 2005 14:24:39 +0000 Subject: [PATCH] With this patch, 32-bit binary can work on 64-bit VMX guest. Signed-off-by: Chengyuan Li Signed-off-by: Jun Nakajima Signed-off-by: Asit Mallick --- xen/arch/x86/vmx.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c index 23efd4fd5f..38976b0781 100644 --- a/xen/arch/x86/vmx.c +++ b/xen/arch/x86/vmx.c @@ -1394,21 +1394,20 @@ static int vmx_cr_access(unsigned long exit_qualification, struct cpu_user_regs static inline void vmx_do_msr_read(struct cpu_user_regs *regs) { + u64 msr_content = 0; + VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read: ecx=%lx, eax=%lx, edx=%lx", (unsigned long)regs->ecx, (unsigned long)regs->eax, (unsigned long)regs->edx); switch (regs->ecx) { case MSR_IA32_SYSENTER_CS: - __vmread(GUEST_SYSENTER_CS, ®s->eax); - regs->edx = 0; + __vmread(GUEST_SYSENTER_CS, (u32 *)&msr_content); break; - case MSR_IA32_SYSENTER_ESP: - __vmread(GUEST_SYSENTER_ESP, ®s->eax); - regs->edx = 0; + case MSR_IA32_SYSENTER_ESP: + __vmread(GUEST_SYSENTER_ESP, &msr_content); break; - case MSR_IA32_SYSENTER_EIP: - __vmread(GUEST_SYSENTER_EIP, ®s->eax); - regs->edx = 0; + case MSR_IA32_SYSENTER_EIP: + __vmread(GUEST_SYSENTER_EIP, &msr_content); break; default: if(long_mode_do_msr_read(regs)) @@ -1417,6 +1416,9 @@ static inline void vmx_do_msr_read(struct cpu_user_regs *regs) break; } + regs->eax = msr_content & 0xFFFFFFFF; + regs->edx = msr_content >> 32; + VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read returns: " "ecx=%lx, eax=%lx, edx=%lx", (unsigned long)regs->ecx, (unsigned long)regs->eax, @@ -1425,18 +1427,23 @@ static inline void vmx_do_msr_read(struct cpu_user_regs *regs) static inline void vmx_do_msr_write(struct cpu_user_regs *regs) { + u64 msr_content; + VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_write: ecx=%lx, eax=%lx, edx=%lx", (unsigned long)regs->ecx, (unsigned long)regs->eax, (unsigned long)regs->edx); + + msr_content = (regs->eax & 0xFFFFFFFF) | ((u64)regs->edx << 32); + switch (regs->ecx) { case MSR_IA32_SYSENTER_CS: - __vmwrite(GUEST_SYSENTER_CS, regs->eax); + __vmwrite(GUEST_SYSENTER_CS, msr_content); break; - case MSR_IA32_SYSENTER_ESP: - __vmwrite(GUEST_SYSENTER_ESP, regs->eax); + case MSR_IA32_SYSENTER_ESP: + __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; - case MSR_IA32_SYSENTER_EIP: - __vmwrite(GUEST_SYSENTER_EIP, regs->eax); + case MSR_IA32_SYSENTER_EIP: + __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; default: long_mode_do_msr_write(regs); -- 2.30.2